shell: Make KeyringPrompt.cancel() callable from signal handlers

gcr/gnome-keyring don't handle the case where prompt_password_async()/
prompt_confirm_async() return their result from within the function
very well (or rather: break badly). Calling gcr_prompt_close() instead
is safe, but to avoid these kind of errors in the future, modify
shell_keyring_prompt_cancel() to work as expected in this case.

https://bugzilla.gnome.org/show_bug.cgi?id=708187

diff --git a/src/shell-keyring-prompt.c b/src/shell-keyring-prompt.c
index bafcb90b4feb919bb2aaf808b63602cda65dfbcf..2e9bc67ebf4ee749213687b1b8d3dd44692b48ed 100644 (file)
--- a/src/shell-keyring-prompt.c
+++ b/src/shell-keyring-prompt.c
@@ -771,6 +771,6 @@ shell_keyring_prompt_cancel (ShellKeyringPrompt *self)
   self->async_result = NULL;
   self->mode = PROMPTING_NONE;
 
-  g_simple_async_result_complete (res);
+  g_simple_async_result_complete_in_idle (res);
   g_object_unref (res);
 }